From 6ae9f7e7c33b0ebaf4873040a4cacf6d53ee7d52 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 16 Oct 2020 17:57:20 -0400 Subject: [PATCH] meson: Simplify xinerama dependency check --- meson.build | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index caa4c8a50f..f3ff23986b 100644 --- a/meson.build +++ b/meson.build @@ -541,15 +541,10 @@ if x11_enabled cdata.set('XINPUT_2_2', 1) endif - enable_xinerama = get_option('xinerama').enabled() - if enable_xinerama - xinerama_dep = dependency('xinerama', required: true) - if xinerama_dep.found() and cc.has_header_symbol('X11/extensions/Xinerama.h', 'XineramaQueryExtension', dependencies: xinerama_dep) - cdata.set('HAVE_XFREE_XINERAMA', 1) - x11_pkgs += ['xinerama'] - endif - else - xinerama_dep = [] + xinerama_dep = dependency('xinerama', required: get_option('xinerama')) + if xinerama_dep.found() and cc.has_header_symbol('X11/extensions/Xinerama.h', 'XineramaQueryExtension', dependencies: xinerama_dep) + cdata.set('HAVE_XFREE_XINERAMA', 1) + x11_pkgs += ['xinerama'] endif cdata.set('HAVE_RANDR', xrandr_dep.found()) -- 2.30.2